remove spurious conflict marker from ChangeLog
authorEmmanuele Bassi <ebassi@src.gnome.org>
Thu, 15 Mar 2007 21:00:07 +0000 (21:00 +0000)
committerEmmanuele Bassi <ebassi@src.gnome.org>
Thu, 15 Mar 2007 21:00:07 +0000 (21:00 +0000)
commitb55d6e4bc93e974955fb69b7cdab13cabd178064
tree2a38c73474c24d40f4e4b4195ab73ac8b16e0cad
parent51aba3699128c2192c5d40c5860eae6dae6148d6
remove spurious conflict marker from ChangeLog

svn path=/trunk/; revision=17527
ChangeLog